Merge branch 'sb/test-cherry-pick-submodule-getting-in-a-way'

[git] / t / t4135 / diff-with spaces.diff

--- post image.txt.orig 2010-08-18 20:13:31.544002255 -0500
+++ post image.txt      2010-08-18 20:13:31.544002255 -0500
@@ -1 +1 @@
-preimage
+postimage